Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
173,789 Commits 3 Branches 0 Tags
43dc963a431a9531d3071ca7192a5fb29320da64
Commit Graph

43933 Commits

Author SHA1 Message Date
Jeff Brown
43dc963a43 am eadefb25: am bba231d7: Explicitly bind AsyncTask to main looper. automerge: dfe7d21 
* commit 'eadefb255a2bda602ccc043531a231413e8ea839':
  Explicitly bind AsyncTask to main looper.
 2014-11-15 03:09:44 +00:00
Ruben Brunk
82b9f663ec am 60af60c4: am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev automerge: 73a7f28 
* commit '60af60c4b04b992f5a9e6a8f613b6b802276552a':
  camera2: Add READ_SETTINGS capability.
 2014-11-15 03:09:39 +00:00
Jeff Brown
eadefb255a am bba231d7: Explicitly bind AsyncTask to main looper. 
automerge: dfe7d21

* commit 'dfe7d2193cd36099d4395bdee8458c53bf5f1124':
  Explicitly bind AsyncTask to main looper.
 2014-11-15 02:47:56 +00:00
Ruben Brunk
60af60c4b0 am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev 
automerge: 73a7f28

* commit '73a7f2862c0b9546d9f826ec2d0ae8a97b10c24e':
  camera2: Add READ_SETTINGS capability.
 2014-11-15 02:46:45 +00:00
Jeff Brown
dfe7d2193c am bba231d7: Explicitly bind AsyncTask to main looper. 
* commit 'bba231d7a63b58a8c2b174722ed1487b0f7d8270':
  Explicitly bind AsyncTask to main looper.
 2014-11-15 01:38:48 +00:00
Ruben Brunk
73a7f2862c am 4d2d9776: Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev 
* commit '4d2d97763f0963d7011d04290dc87b2940aefb33':
  camera2: Add READ_SETTINGS capability.
 2014-11-15 01:25:09 +00:00
Jeff Brown
bba231d7a6 Explicitly bind AsyncTask to main looper. 
It seems we were sort of trying to do this by forcing the AsyncTask
static initializer to run at certain times but it was not sufficiently
reliable.  In particular, this resulted in occasional system
server crashes.

Bug: 18192406
Change-Id: Ief73210c60e7680fbed6df74e3e58809b7ec7e4d
 2014-11-14 17:22:31 -08:00
Ruben Brunk
4d2d97763f Merge "camera2: Add READ_SETTINGS capability." into lmp-mr1-dev 2014-11-15 01:13:54 +00:00
John Reck
eb4afaeedd am ff0c4856: am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev automerge: f1812b1 
* commit 'ff0c4856f4f912f483c8293a72657d82b1dd14a9':
  Document that circular reveal is async
 2014-11-14 23:05:36 +00:00
Yuncheol Heo
f946a522b7 am 376dee63: am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev automerge: cde2617 
* commit '376dee63f383d31f547a09d9708103592d9e0dd9':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
 2014-11-14 23:01:05 +00:00
John Reck
ff0c4856f4 am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev 
automerge: f1812b1

* commit 'f1812b17bb3396a28f3be8d19e0086de2be613a6':
  Document that circular reveal is async
 2014-11-14 22:58:50 +00:00
Yuncheol Heo
376dee63f3 am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev 
automerge: cde2617

* commit 'cde261796b3b38e05380ba186cb78350f83e2d30':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
 2014-11-14 22:57:33 +00:00
John Reck
f1812b17bb am 8f5839be: Merge "Document that circular reveal is async" into lmp-mr1-dev 
* commit '8f5839be21f028885b6171e75cba479a020a3a0c':
  Document that circular reveal is async
 2014-11-14 22:07:29 +00:00
John Reck
8f5839be21 Merge "Document that circular reveal is async" into lmp-mr1-dev 2014-11-14 22:03:33 +00:00
John Reck
a3b35907de Document that circular reveal is async 
Bug: 18058966
Change-Id: I64b35441f12bec433f633580319ec73c1e11e7a2
 2014-11-14 14:02:55 -08:00
Raph Levien
0a39f8ffe0 am 7010d0b6: am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev automerge: 58fa003 
* commit '7010d0b6c398cb03b4be43a547921c3e9a95eeb0':
  Check bounds on CharSequence drawText methods
 2014-11-14 22:00:49 +00:00
Raph Levien
228eab2480 am c047ca45: am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev automerge: fbe0e8f 
* commit 'c047ca454012d49820e9bf14f4501156e4479881':
  Update hint text color even when text present
 2014-11-14 21:56:01 +00:00
Raph Levien
487b26f411 am 2d208505: am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev automerge: be1ad50 
* commit '2d2085052550ad0fa1b032d6cc3123b5524c5fe8':
  Fudge clipRect in TextView for extra cursor width
 2014-11-14 21:55:56 +00:00
Jeff Sharkey
2d55c4e2e8 am b536c7a6: am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev automerge: 47d2c97 
* commit 'b536c7a69340b85ef70197bbc4e443205110e2a5':
  Block loading WebView in privileged processes.
 2014-11-14 21:55:52 +00:00
Yuncheol Heo
cde261796b am 8977c1da: Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev 
* commit '8977c1dab572cb61ebff1f844a549f7fb2e4e590':
  CEC: Fix a bug in HdmiPortInfo.createFromParcel().
 2014-11-14 21:55:43 +00:00
Raph Levien
7010d0b6c3 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
automerge: 58fa003

* commit '58fa0035775bbb897115bae1b59719391a1a7edd':
  Check bounds on CharSequence drawText methods
 2014-11-14 21:53:11 +00:00
Raph Levien
c047ca4540 am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev 
automerge: fbe0e8f

* commit 'fbe0e8f4183f3a42fde9aeeed024bee2fbf182b6':
  Update hint text color even when text present
 2014-11-14 21:51:44 +00:00
Raph Levien
2d20850525 am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 
automerge: be1ad50

* commit 'be1ad50b34e160c5d490d1165a590eb4c633d996':
  Fudge clipRect in TextView for extra cursor width
 2014-11-14 21:50:37 +00:00
Yin-Chia Yeh
3733997225 am 19e1512d: am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev automerge: 46810bf 
* commit '19e1512dcad93a7c0217b5401208e6717962cc84':
  Camera: doc update for independent 3A
 2014-11-14 21:50:29 +00:00
Yuncheol Heo
8977c1dab5 Merge "CEC: Fix a bug in HdmiPortInfo.createFromParcel()." into lmp-mr1-dev 2014-11-14 21:50:21 +00:00
Jeff Sharkey
b536c7a693 am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 
automerge: 47d2c97

* commit '47d2c97e7084a676fe2b4d96683912279046b28c':
  Block loading WebView in privileged processes.
 2014-11-14 21:47:17 +00:00
Yin-Chia Yeh
19e1512dca am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 
automerge: 46810bf

* commit '46810bf2002b89ed2ad90e000294011f928af12a':
  Camera: doc update for independent 3A
 2014-11-14 21:42:45 +00:00
Raph Levien
58fa003577 am 505ffe36: Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 
* commit '505ffe3633f45778e493e23ad8c163f09ed1dbb5':
  Check bounds on CharSequence drawText methods
 2014-11-14 20:56:46 +00:00
Raph Levien
fbe0e8f418 am 25f7c4b9: Merge "Update hint text color even when text present" into lmp-mr1-dev 
* commit '25f7c4b99284cd1e118f50bd585e6534acfad7c4':
  Update hint text color even when text present
 2014-11-14 20:56:40 +00:00
Raph Levien
be1ad50b34 am cda81f2d: Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 
* commit 'cda81f2ded39b53dd813071760ad235363292d52':
  Fudge clipRect in TextView for extra cursor width
 2014-11-14 20:56:35 +00:00
Raph Levien
505ffe3633 Merge "Check bounds on CharSequence drawText methods" into lmp-mr1-dev 2014-11-14 20:54:29 +00:00
Raph Levien
25f7c4b992 Merge "Update hint text color even when text present" into lmp-mr1-dev 2014-11-14 20:53:14 +00:00
Raph Levien
cda81f2ded Merge "Fudge clipRect in TextView for extra cursor width" into lmp-mr1-dev 2014-11-14 20:51:58 +00:00
Jeff Sharkey
47d2c97e70 am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 
* commit '27936ad3a677509fab1174c7b6655c894f018143':
  Block loading WebView in privileged processes.
 2014-11-14 19:33:49 +00:00
Jeff Sharkey
27936ad3a6 Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 2014-11-14 19:24:53 +00:00
Esteban Talavera
cdf1bd3da4 am fb70be1d: am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users. 
* commit 'fb70be1d1fbe659578dd0dd3c32e01da12ac5b08':
  New AccountManager method to copy accounts between users.
 2014-11-14 19:19:52 +00:00
Sander Alewijnse
25e9dbc4cf am 75f79bc0: am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 
* commit '75f79bc08b5d8c2cfe999f1dfd0d1d880c58ff93':
  Add extra to enable device admins to skip removal of system apps.
 2014-11-14 19:19:36 +00:00
Alan Viverette
b7fbcefcec am db3aa6be: am 04bea090: am 0224d25d: Merge "Account for window bounds in accessibility view click point computation" into lmp-mr1-dev 
* commit 'db3aa6be933b732c57e7e124f40388b0695a3638':
  Account for window bounds in accessibility view click point computation
 2014-11-14 19:18:32 +00:00
Alan Viverette
3cad91aa5c am 8f5de8c6: am 96dacf36: am 24859ba0: Merge "Don\'t dismiss AutoCompleteTextView on focus change while temp detached" into lmp-mr1-dev 
* commit '8f5de8c6c0d5da3c81670b72d5b412acea502d22':
  Don't dismiss AutoCompleteTextView on focus change while temp detached
 2014-11-14 19:17:09 +00:00
ztenghui
2f96e233de am bac3f5a6: am 9f671553: am 475569e9: Merge "Fix the starting pen\'s position when a path close." into lmp-mr1-dev 
* commit 'bac3f5a6f055876d8892ff27fb8db7355a188a68':
  Fix the starting pen's position when a path close.
 2014-11-14 19:17:00 +00:00
Abhijith Shastry
e3435feed4 am 0f064207: am 530f25d6: am fb8db1c8: Merge "new sms/mms carrier app API" into lmp-mr1-dev 
* commit '0f0642075e42f415d7f5244c5d94fe726756afa0':
  new sms/mms carrier app API
 2014-11-14 19:16:33 +00:00
Yin-Chia Yeh
46810bf200 am cb6eae0e: Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 
* commit 'cb6eae0e2eda2a9383ba2682b739b3616a9eaefc':
  Camera: doc update for independent 3A
 2014-11-14 19:06:37 +00:00
Jeff Sharkey
85844916b8 Block loading WebView in privileged processes. 
WebView is very powerful, but it also has a large attack area.  To
improve security, refuse to load WebView components when running as
the root or system UIDs.

Bug: 18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
 2014-11-14 11:02:27 -08:00
Yin-Chia Yeh
cb6eae0e2e Merge "Camera: doc update for independent 3A" into lmp-mr1-dev 2014-11-14 18:36:33 +00:00
Esteban Talavera
fb70be1d1f am 95162ad2: am 22dc3b7b: New AccountManager method to copy accounts between users. 
* commit '95162ad2eaa45cf2643b564c7fd03bfe0e4844de':
  New AccountManager method to copy accounts between users.
 2014-11-14 11:42:48 +00:00
Esteban Talavera
95162ad2ea am 22dc3b7b: New AccountManager method to copy accounts between users. 
* commit '22dc3b7ba111e27bce99a7cce966598e7873508c':
  New AccountManager method to copy accounts between users.
 2014-11-14 11:37:33 +00:00
Esteban Talavera
22dc3b7ba1 New AccountManager method to copy accounts between users. 
Adding the copyAccountToUser method which copies an account
along with its credentials to a different user.

Also an extra in the public api to identify the account to migrate
during provisioning.

Bug: 17716971
Change-Id: I2f29f1765ba0d360a3894b13ef86253b7c7d3284
 2014-11-14 11:09:27 +00:00
Sander Alewijnse
75f79bc08b am 7bec28c5: am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 
* commit '7bec28c5a1e1c0787542930ed291f5aadfee6e75':
  Add extra to enable device admins to skip removal of system apps.
 2014-11-14 10:38:44 +00:00
Sander Alewijnse
7bec28c5a1 am f39cec0b: Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 
* commit 'f39cec0b068abcf306eb91c304ed2eb76e60f8c0':
  Add extra to enable device admins to skip removal of system apps.
 2014-11-14 10:32:45 +00:00
Sander Alewijnse
f39cec0b06 Merge "Add extra to enable device admins to skip removal of system apps." into lmp-mr1-dev 2014-11-14 10:26:38 +00:00