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

47738 Commits

Author SHA1 Message Date
Ying Wang
affbaee9c1 am c2045047: resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp 
* commit 'c2045047735522f50bc1d2618280bd37306f18d2':
  Move preloaded-classes out of framework.jar.
 2014-11-17 19:24:11 +00:00
Ying Wang
c204504773 resolved conflicts for merge of 5c7bc931 to lmp-mr1-dev-plus-aosp 
Change-Id: Id3130cf4a23f07953e06301fe93f1da54b9ca191
 2014-11-17 10:56:26 -08:00
Ying Wang
5c7bc93127 am 867a0de0: Merge "Move preloaded-classes out of framework.jar." into lmp-mr1-dev 
* commit '867a0de0b4632984b7a73ee3489e4d1f66c19dd7':
  Move preloaded-classes out of framework.jar.
 2014-11-17 18:24:32 +00:00
Ying Wang
867a0de0b4 Merge "Move preloaded-classes out of framework.jar." into lmp-mr1-dev 2014-11-17 18:14:06 +00:00
Jeff Sharkey
4ae37f9052 am 9f722068: am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* commit '9f722068483239516d0d31841d1deb189d01b5c1':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:44:28 +00:00
Jeff Sharkey
9f72206848 am ecfd372a: am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* commit 'ecfd372ae4fc69c10de83c6499c0c0e4379debc8':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:39:16 +00:00
Jeff Sharkey
ecfd372ae4 am 9c76a7b3: Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* commit '9c76a7b3e85ce7056071ac8627c8d675cc5c1599':
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:32:31 +00:00
Jeff Sharkey
9c76a7b3e8 Merge changes Id7f9fb53,I897d7ee8 into lmp-mr1-dev 
* changes:
  Prevent user ID reuse until after reboot.
  Warn user when build fingerprints differ.
 2014-11-17 17:28:54 +00:00
John Reck
17762bb9c7 am 64b5e00a: am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 
* commit '64b5e00aaa53dbca59e8b997184bf479f68915eb':
  Wire up surface width/height to lockHardwareCanvas
 2014-11-17 15:31:12 +00:00
John Reck
64b5e00aaa am ff597898: am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'ff5978988abceeb0f2c8324a9ab66b7c958edd34':
  Wire up surface width/height to lockHardwareCanvas
 2014-11-17 15:27:43 +00:00
John Reck
ff5978988a am b3ec64e1: Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 
* commit 'b3ec64e1005c82d41b6d1a1d86b6933fd25d87d2':
  Wire up surface width/height to lockHardwareCanvas
 2014-11-17 15:23:11 +00:00
John Reck
b3ec64e100 Merge "Wire up surface width/height to lockHardwareCanvas" into lmp-mr1-dev 2014-11-17 15:19:23 +00:00
Ying Wang
0de36e51c5 Move preloaded-classes out of framework.jar. 
Instead we install preloaded-classes as a standalone configuration file
/system/etc/preloaded-classes, so we can configure different file per product.

Bug: 18305157
Change-Id: I22f1a1dd44f90268d02532bf18405768523c0b1b
 2014-11-17 10:15:39 +00:00
Tom Turney
dfd827e424 am e9f8d1dd: am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisem 
* commit 'e9f8d1ddbdfe6bf9d4b4a9cb1fca8703febff742':
  Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes.
 2014-11-15 03:38:12 +00:00
Tom Turney
e9f8d1ddbd am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement\'s adverti 
automerge: fa90087

* commit 'fa900872742252fd0b56760a3390cea38166adb9':
  Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes.
 2014-11-15 03:33:04 +00:00
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
Tom Turney
fa90087274 am 2a46722f: Merge "Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement\'s adverti 
* commit '2a46722f96480aed028785e955cbb8cb506df0b2':
  Feature request: Increasing advertise data size on non-connectable adv. When the advertisement is non-connectable, give back the bytes to the advertiser where the adv flags would have been. This increases the non-connectable advertisement's advertise data from 24 to 27 bytes.
 2014-11-15 03:07:29 +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
Tom Turney
29230ceab9 Feature request: Increasing advertise data size on 
non-connectable adv.
When the advertisement is non-connectable, give back the
bytes to the advertiser where the adv flags would have been.
This increases the non-connectable advertisement's advertise
data from 24 to 27 bytes.

Bug:18359570
Change-Id: Ia3cc48dca50cc3c51095ee92a489f143f6d350b1
 2014-11-15 02:25:05 +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
Jeff Sharkey
2cffc7dafd Warn user when build fingerprints differ. 
We're now shipping devices with several partitions which may end up
mismatched, causing subtle runtime issues.  To help manufacturers and
users catch this case, show wanring when we detected mismatched
fingerprints.

Bug: 18357469
Change-Id: I897d7ee8cbf3b8042d3d7d282afab277d242ed3f
 2014-11-14 14:28:06 -08: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