drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
171,717 Commits 1 Branch 0 Tags
Commit Graph

171717 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Luan Nguyen
56102be892 am 443e57df: am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '443e57df26077652d35b4e294e4a5ed3cd6030b3':
  docs: Add two new general functionality requirements
 2014-12-16 02:23:17 +00:00
Mark Renouf
990d605733 am 3e4a43e4: am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours 
* commit '3e4a43e4f5bbf273dcaef049a2c0c1574c62fc82':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 02:23:11 +00:00
Luan Nguyen
443e57df26 am 556ce7f1: am 47efca78: am a854ddfd: docs: Add two new general functionality requirements automerge: bb01880 
* commit '556ce7f145de641e0f920ed3059be5a82eb0bb7b':
  docs: Add two new general functionality requirements
 2014-12-16 01:54:03 +00:00
Mark Renouf
3e4a43e4f5 am 1302ee3a: If no display settings are matched, return the first one. DO NOT MERGE automerge: d3adc51 -s ours 
* commit '1302ee3a2338dec77da81deca51811e31f693c09':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:53:58 +00:00
Brian Carlstrom
9900dbb9e8 am a00be9b4: Remember failed dexopt to avoid retry 
automerge: 2350c7c

* commit '2350c7cb1238ad24b5afaa7f6627b3443d33621b':
  Remember failed dexopt to avoid retry
 2014-12-16 01:46:40 +00:00
Jay Shrauner
58d66c30d7 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
automerge: 59e96ee

* commit '59e96ee423f4fc810f29451144143a581a8cd99a':
  Fix NPE in Transport.applyBatch
 2014-12-16 01:45:09 +00:00
Adam Lesinski
22bfb75ebb am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 
automerge: 465d123

* commit '465d123464eadf180b618164b2ed23702bca3d86':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
 2014-12-16 01:43:16 +00:00
Luan Nguyen
556ce7f145 am 47efca78: am a854ddfd: docs: Add two new general functionality requirements 
automerge: bb01880

* commit 'bb01880e6216c360a4732b02a1becb32520fcf5e':
  docs: Add two new general functionality requirements
 2014-12-16 01:30:17 +00:00
Mark Renouf
1302ee3a23 If no display settings are matched, return the first one. DO NOT MERGE 
automerge: d3adc51  -s ours

* commit 'd3adc51a1b845e37845af6a885ce7371c2ce252c':
  If no display settings are matched, return the first one. DO NOT MERGE
 2014-12-16 01:29:01 +00:00
Brian Carlstrom
2350c7cb12 am a00be9b4: Remember failed dexopt to avoid retry 
* commit 'a00be9b4d521287fdf4678fb196c3e3a0053c3e4':
  Remember failed dexopt to avoid retry
 2014-12-16 00:55:20 +00:00
Jay Shrauner
59e96ee423 am 12b5e504: Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 
* commit '12b5e504fd3845fed9c649cf01cd27b84fb6742c':
  Fix NPE in Transport.applyBatch
 2014-12-16 00:55:11 +00:00
Adam Lesinski
465d123464 am 0f0e85a6: Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 
* commit '0f0e85a68961e303ac85d31fb36ec8384277349d':
  AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices
 2014-12-16 00:54:59 +00:00
Brian Carlstrom
a00be9b4d5 Remember failed dexopt to avoid retry 
Bug: 18643977
Change-Id: Ida8d9b9ce992d97fb75bccb8c3da0d9d73a480a9
 2014-12-15 15:57:56 -08:00
Jay Shrauner
12b5e504fd Merge "Fix NPE in Transport.applyBatch" into lmp-mr1-dev 2014-12-15 23:56:53 +00:00
Adam Lesinski
0f0e85a689 Merge "AAPT: attributes showing up after v21 attributes would be removed for pre-21 devices" into lmp-mr1-dev 2014-12-15 23:35:23 +00:00
Jorim Jaggi
4800de0f7c am 93c736b3: am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 
* commit '93c736b3daa9b715814dd20892c1f41b5348f575':
  Revert "Revert "Attempt to fix keyguard missing bug""
 2014-12-15 22:41:50 +00:00
Jorim Jaggi
93c736b3da am 613fffcd: Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 
* commit '613fffcd0f17eecb0231fe24f7abf7936eef8d37':
  Revert "Revert "Attempt to fix keyguard missing bug""
 2014-12-15 22:35:56 +00:00
Jay Shrauner
ac2506c7e3 Fix NPE in Transport.applyBatch 
Bug:18756774
Change-Id: I1da4f0131b1529598043e4cb9fb226d02bff8669
 2014-12-15 13:25:52 -08:00
Jorim Jaggi
613fffcd0f Merge "Revert "Revert "Attempt to fix keyguard missing bug""" into lmp-mr1-dev 2014-12-15 19:56:45 +00:00
Elliott Hughes
3e8484c3f7 am 2a6426c9: am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit '2a6426c900d319c7b928242694ad050a73ad324b':
  Reimplement reopenStdio in Java.
 2014-12-15 19:38:04 +00:00
Elliott Hughes
2a6426c900 am e9e1e0d2: Merge "Reimplement reopenStdio in Java." 
* commit 'e9e1e0d20f1f7bae11f5df74d14c7b1be4edc8ac':
  Reimplement reopenStdio in Java.
 2014-12-15 19:30:56 +00:00
Amit Mahajan
98cc133f07 am 2fab5307: am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit '2fab5307d1983b0415b7eeb79779ecaee7b67ea1':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:27:10 +00:00
Elliott Hughes
e9e1e0d20f Merge "Reimplement reopenStdio in Java." 2014-12-15 19:24:53 +00:00
Amit Mahajan
2fab5307d1 am d060b50b: Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 
* commit 'd060b50b331f540d42c91501d820e3c2601dec18':
  Change to treat slotId 0 emergency numbers as default.
 2014-12-15 19:19:06 +00:00
Jim Miller
a8800f7c27 Revert "Revert "Attempt to fix keyguard missing bug"" 
This reverts commit 1991590ddd0ca6d3a0cac290b65120c147034dbc
and fixes a bug where we were showing the scrim on devices without keyguard.

Bug: 18468369
Change-Id: Idce1370dadacd09c4a8f1a7fd9728c23b218d19c
 2014-12-15 20:12:09 +01:00
Amit Mahajan
d060b50b33 Merge "Change to treat slotId 0 emergency numbers as default." into lmp-mr1-dev 2014-12-15 19:06:48 +00:00
Elliott Hughes
dac83f5e6a Reimplement reopenStdio in Java. 
Bug: 18719692
Change-Id: I4ed984cd6148c5cba75d46a60f32a0687a5bcac3
 2014-12-15 11:00:25 -08:00
Amit Mahajan
d9835f0c16 Change to treat slotId 0 emergency numbers as default. 
Emergency numbers are slot specific. This change is to read emergency
numbers for slotId 0 if slotId is unknown/invalid.

Bug: 18656027
Change-Id: Ibaeb720955f6abc421b84d3cb32eb812b6c55a34
 2014-12-15 10:38:27 -08:00
Alan Viverette
878a5a6cd7 am 2f11125a: am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '2f11125a7186cc65713804c939a0e538538d9f35':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:38:25 +00:00
Alan Viverette
37ea640fa9 am 2311ded6: am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2311ded6a3da117aee221c0cf1168c24160d9041':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:38:19 +00:00
Alan Viverette
2f11125a71 am 9973643b: Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 
* commit '9973643bfc123fcc73803542ef8cb74e243907ce':
  Give accessibility delegate the first pass at handling ACTION_CLICK
 2014-12-15 17:31:36 +00:00
Alan Viverette
2311ded6a3 am 2649c58b: Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 
* commit '2649c58b460c2cd841173a8db513a54180422330':
  Avoid self-recursion if client calls init() from date listener
 2014-12-15 17:31:31 +00:00
Alan Viverette
9973643bfc Merge "Give accessibility delegate the first pass at handling ACTION_CLICK" into lmp-mr1-dev 2014-12-15 17:27:24 +00:00
Alan Viverette
2649c58b46 Merge "Avoid self-recursion if client calls init() from date listener" into lmp-mr1-dev 2014-12-15 17:26:39 +00:00
Geoff Mendal
7f2116d1db am 301a6176: (-s ours) am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit '301a617698e74bb413df52f93ea7908a33423250':
  Import translations. DO NOT MERGE
 2014-12-15 15:25:44 +00:00
Geoff Mendal
301a617698 am d6fc7cf1: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 
* commit 'd6fc7cf149795abdcd0629e229be52b816ee13c1':
  Import translations. DO NOT MERGE
 2014-12-15 15:17:58 +00:00
Geoff Mendal
ea96415646 am b73e02cf: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit 'b73e02cf5c736a944155b9d4586d8e8a6e40dc6e':
  Import translations. DO NOT MERGE
 2014-12-15 15:17:39 +00:00
Geoff Mendal
b73e02cf5c Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 15:11:25 +00:00
Geoff Mendal
d6fc7cf149 Merge "Import translations. DO NOT MERGE" into lmp-mr1-dev 2014-12-15 15:10:39 +00:00
Geoff Mendal
099cce32d2 Import translations. DO NOT MERGE 
Change-Id: I1631f2d7e5eca790da4ce7b78e90c626f96be23c
Auto-generated-cl: translation import
 2014-12-15 06:56:40 -08:00
Geoff Mendal
111a81669e Import translations. DO NOT MERGE 
Change-Id: I18accc4c251f9f5bbaa69512b317898637daed64
Auto-generated-cl: translation import
 2014-12-15 06:50:18 -08:00
Geoff Mendal
0736ee2631 am 0c8802bb: (-s ours) Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 
* commit '0c8802bb3ee36247f92300a1bed2ead77c436479':
  Import translations. DO NOT MERGE
 2014-12-15 14:43:49 +00:00
Geoff Mendal
06b284f22b am b6a5dab3: (-s ours) am feb6c7f3: (-s ours) Import translations. DO NOT MERGE 
* commit 'b6a5dab3ed29c9c9bc864abff0e534641dcd4f32':
  Import translations. DO NOT MERGE
 2014-12-15 14:43:43 +00:00
Geoff Mendal
0c8802bb3e Merge "Import translations. DO NOT MERGE" into lmp-mr1-ub-dev 2014-12-15 14:39:49 +00:00
Geoff Mendal
b6a5dab3ed am feb6c7f3: (-s ours) Import translations. DO NOT MERGE 
* commit 'feb6c7f3d6d52648009ffb6fffa1f76d2f68fd21':
  Import translations. DO NOT MERGE
 2014-12-15 14:36:56 +00:00
Geoff Mendal
e184608398 Import translations. DO NOT MERGE 
Change-Id: Ifbbb87b8df40d269d7e28aa398dcacc878c93011
Auto-generated-cl: translation import
 2014-12-15 06:28:48 -08:00
Geoff Mendal
feb6c7f3d6 Import translations. DO NOT MERGE 
Change-Id: I70dc0646e4b8ea8b83dc1f7106067e278260bb3a
Auto-generated-cl: translation import
 2014-12-15 06:25:08 -08:00
Prem Kumar
da6ebb4ee2 am fa205fff: am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 
* commit 'fa205ffff292bcbc1c504491b7ca2a5ee1b7b547':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
 2014-12-14 20:06:28 +00:00
Prem Kumar
3be9a9cefb am cb9379ca: am 6c2fa049: Merge "handle beacons reported with wrong RSSI value of 0 - Bug:18654243" into lmp-mr1-dev 
* commit 'cb9379ca774a503a9d33f3c0e8c5010495d2af58':
  handle beacons reported with wrong RSSI value of 0 - Bug:18654243
 2014-12-14 20:06:22 +00:00
Prem Kumar
fa205ffff2 am 9ef07ad2: Merge "make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749" into lmp-mr1-dev 
* commit '9ef07ad2b63edd4094bd8f15ccf861c7b014b2b0':
  make sure wificonfiguration scan cache doesnt grow unbounded Bug:18703749
 2014-12-14 19:59:40 +00:00